Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Dec 2011 18:02:29 +0000 (10:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Dec 2011 18:02:29 +0000 (10:02 -0800)

Trivial merge